YUV output: correct a rext merge issue
YUV Output: more rext merge bugs
Merge