Merge "Don't CHECK for unknown fourcc" into pi-dev