Merge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jun 2014 00:36:22 +0000 (02:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jun 2014 00:40:50 +0000 (02:40 +0200)
commit1c5aa64a5927573a875934404d15f76e968f1e8d
treee3da9d7fb2fe1a07adaa134095db64a6f5ccfe24
parentc5fc8ae12622a507d7b9ee30ddcd3734e6de6b1d
parent4321e507564b2d8a5dfc630f8d6fefba6fdc1e92
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@gmx.at>