Improve debugging output before sws_scale
merge fixes
Merge branch 'v4l2_fixes' of ../ZoneMinder.master into iconnor