Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 20:02:41 +0000 (22:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 20:02:41 +0000 (22:02 +0200)
commit7026d8accdb2d3b013fec5c7c7620f1b769e6c7b
tree0b48b19031c21354962ee60243977d46352871e9
parentc508fef3c737321ad719db6ec62e1d011726baa8
parent1b1bb2c4efc126d74d44d8c421860c85f932ecb1
Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'

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

Conflicts:
libavcodec/rl.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rl.c
libavcodec/rl.h