[FFmpeg-cvslog] Merge commit '5c30ae1a09b66179e16694f6137658023ed1fef3'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Nov 22 17:15:21 2015 +0000| [cde68661bfa5a3049c08e79f1e38a3df597f18d8] | committer: Derek Buitenhuis

Merge commit '5c30ae1a09b66179e16694f6137658023ed1fef3'

* commit '5c30ae1a09b66179e16694f6137658023ed1fef3':
  dvdsubdec: Validate the RLE offsets

  Conflicts:
      libavcodec/dvdsubdec.c

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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