Merge commit '4321e507'

* commit '4321e507':
  configure: use pkg-config for libx264

Not merged as requested by carl
a patch to fix this has been posted by carl to ffmpeg-devel
Merged-by: Michael Niedermayer <michaelni@gmx.at>