dnxhddec: resolve conflicts
v210dec: resolve conflicts