DVDVideoCodec.h - Fix merge error