motion_est: resolve conflict
mpeg4videodec: fix conflicts