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)
* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
  flashsv: Check diff_start diff_height values

Conflicts:
libavcodec/flashsv.c

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

Simple merge