Merge pull request #1051 from cdavis5e/ycbcr-fixes

Y'CbCr fixes