DVDDemuxFFmpeg.cpp: fix merge errors