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)
* commit '61335ab33e594d47b84fde7367ee10dc66fc3465':
  opt: check memory allocation

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

diff --cc libavutil/opt.c
Simple merge