Merge "Change to fourcc to enable decoding of ffmpeg files." into experimental