Commit 32365667 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '73953df7'

* commit '73953df7':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents efec7304 73953df7
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment