Merge "mm-video-v4l2: venc: Do not swap output resolution"