[FFmpeg-cvslog] Merge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 13 02:36:22 2014 +0200| [1c5aa64a5927573a875934404d15f76e968f1e8d] | committer: Michael Niedermayer

Merge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'

* commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c5aa64a5927573a875934404d15f76e968f1e8d
---