Updated for ffmpeg-0.5 use - namely added back --enable-swscale configure option. Also added two more configure (with-x264ver and with-ffmpegver) options to provide for building with specific version of ffmpeg or x264.
Merge commit '665ef39' into consolidated

- git merge from mpeg4 into cc branch.

Conflicts:
	configure