merge - xine-lib-1.2.2: Fix up build with recent libav*.