I am about to upgrade to a Canon 7D for my birding using my 400mm 5.6L lens. With the 1.6 crop factor sensor that gives (roughly) a magnification factor equivalent to my other option, a Canon 5D mkII with the same lens plus a Canon 1.4 extender.
Assuming all other things are equal and the cameras are set up and handled correctly, any suggestions as to which option is most likely to produce the best image quality?