DVDStream: fix merge error