[FFmpeg-cvslog] Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 11:55:08 2013 +0200| [d510d70df02b3769a184daa355a461d9c9f51e18] | committer: Michael Niedermayer

Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'

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

Conflicts:
	libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d510d70df02b3769a184daa355a461d9c9f51e18
---