dnxhddec: resolve conflicts