Merge "Allow record to set input color format as a command line option" into gingerbread