Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 20:37:33 +0000 (21:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 20:37:48 +0000 (21:37 +0100)
commitb20e79dbe99806d60ae856da830b9d866ffabcc6
tree97aae10e68492647ac59dc2ba9c7e9c4c864e1cc
parentdede2f7fc4441606fd07035e7c3e62421ec756b0
parent07a0c0f0005072d115ace61e60f46be68582cc3a
Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'

* commit '07a0c0f0005072d115ace61e60f46be68582cc3a':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/opt.c