Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 09:55:08 +0000 (11:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 09:55:08 +0000 (11:55 +0200)
commitd510d70df02b3769a184daa355a461d9c9f51e18
tree185f5ffcc952359864fa81d69b8ca5405f7edd0a
parentc16cd555934999a22d1f0a87d4ceea2b31ccefe6
parentd002fce24a7206e95f9492031f45adc35711e183
Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'

* commit 'd002fce24a7206e95f9492031f45adc35711e183':
  smacker: Check malloc return values

Conflicts:
libavcodec/smacker.c

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