[FFmpeg-cvslog] Merge commit '73953df71a28e94d8959facba7906cf5975ca4ef'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 01:13:52 2014 +0200| [32365667ccebab599eabf5f99ed0cdea20d29750] | committer: Michael Niedermayer

Merge commit '73953df71a28e94d8959facba7906cf5975ca4ef'

* commit '73953df71a28e94d8959facba7906cf5975ca4ef':
  Replace av_malloc() and memset(0) by av_mallocz()

Conflicts:
	libavformat/matroskadec.c
	libavformat/rmdec.c
	libavformat/utils.c

No change, as none of the split malloc+memset existed in ffmpeg

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

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