Merge pull request #10148 from alalek:fix_ffmpeg_sws_scale_crash
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 23 Nov 2017 18:34:59 +0000 (18:34 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 23 Nov 2017 18:35:00 +0000 (18:35 +0000)

Trivial merge