xvba: fix merge after ffmpeg 1.2