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

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