there, that fixed it
Merge branch 'mm-video-support' into s2