ffv1dec: resolve conflicts