Merge "Add channel types for NTSC, PAL and SECAM"