[dvbcut: 2/2] Merge branch 'f25'