When it's time to create the sampling area, you'll have three options: rectangular, auto and custom. The rectangular option creates a box around your selection and takes pixels from that box -- this is how Content-Aware Fill works now. In the next release, the auto option will scan the image and create fill with pixels that match those immediately around the object you're erasing. The custom option lets you hand-pick which pixels Photoshop will use.

We might expect more details on Photoshop's Content-Aware Fill at Adobe MAX. The annual conference begins November 4th. We'll keep our fingers crossed, too, that Adobe brings these controls to After Effects, which got the Content-Aware Fill tool last year.