Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 08:39:51 +0000 (09:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 08:39:51 +0000 (09:39 +0100)
commit525289ed261fb54366fc0983cbb13af0a0e3d8ca
treebe1219fabd9e336d9636bada64f6f2812a517245
parent77c33424c1754d38182880bf320e5a6fcc264611
parent57070b1468edc6ac8cb3696c817f3c943975d4c1
Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'

* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
  flashsv: Check diff_start diff_height values

Conflicts:
libavcodec/flashsv.c

See: 880c73cd76109697447fbfbaa8e5ee5683309446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flashsv.c