Merge commit '61335ab33e594d47b84fde7367ee10dc66fc3465' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 21:43:37 +0000 (22:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 21:43:37 +0000 (22:43 +0100)
commitee910aef38cb1679e7a7b6d9b0126fddbc0b4377
tree1a312a5993b5c15ed10871c90d244754584fde32
parentcdf37f25489f2459b2183b98a7baafebe2bda776
parent61335ab33e594d47b84fde7367ee10dc66fc3465
Merge commit '61335ab33e594d47b84fde7367ee10dc66fc3465' into release/2.4

* commit '61335ab33e594d47b84fde7367ee10dc66fc3465':
  opt: check memory allocation

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