Merge commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 01:36:17 +0000 (03:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 02:46:50 +0000 (04:46 +0200)
commit7db3a46a3d9d10a2b90e8076bf3219ef5a53544b
treea2532d2d78a559503436a221a2488669c78e76ea
parentd76675d9c015eb0203400d3e00c485467a9943d8
parentd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d
Merge commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d'

* commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d':
  pgssubdec: Check RLE size before copying

See: c0d68be555f5858703383040e04fcd6529777061
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pgssubdec.c