mpegvideo: resolve conflicts