Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:00:04 +0000 (21:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:00:04 +0000 (21:00 +0100)
commit15cd2a93e7f64b5b4e4367014a78ee8f9e63c2bb
tree4fd2849df326b20ef08fd8824e98becf05752670
parent9d5017a20c26b98bdd6fec29f3eaa465a779e24c
parent81688e68f93f3142e2093f1a3d226edaeb179992
Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'

* commit '81688e68f93f3142e2093f1a3d226edaeb179992':
  avconv: Check rc_override memory allocation

Conflicts:
ffmpeg_opt.c

See: 7efabffc2899b76688a40b4bd7c63370eb2d8ca8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt.c