Merge "Relocated idct/add calls for encoder"