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

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

diff --cc libavutil/opt.c
Simple merge