Adding edge extension to encoder input.
Merge branch 'master' into cj-mc1