[FFmpeg-cvslog] Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 28 22:02:41 2015 +0200| [7026d8accdb2d3b013fec5c7c7620f1b769e6c7b] | committer: Michael Niedermayer

Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'

* commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1':
  rl: Add error checking to ff_rl_init().

Conflicts:
	libavcodec/rl.h

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

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