[FFmpeg-cvslog] Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 21:00:04 2015 +0100| [15cd2a93e7f64b5b4e4367014a78ee8f9e63c2bb] | committer: Michael Niedermayer

Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'

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

Conflicts:
	ffmpeg_opt.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15cd2a93e7f64b5b4e4367014a78ee8f9e63c2bb
---