Merge commit '5c30ae1a09b66179e16694f6137658023ed1fef3'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:15:21 +0000 (17:15 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:15:21 +0000 (17:15 +0000)
commitcde68661bfa5a3049c08e79f1e38a3df597f18d8
tree442b4103b4959cff953858cb8bd08afc007a844c
parentdf8e24be5da2f9a8b0bd86dbbd1b0bf508bac003
parent5c30ae1a09b66179e16694f6137658023ed1fef3
Merge commit '5c30ae1a09b66179e16694f6137658023ed1fef3'

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

  Conflicts:
      libavcodec/dvdsubdec.c

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/dvdsubdec.c