[FFmpeg-cvslog] Merge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  2 18:54:57 2015 +0200| [cec345625480482d99e7bc6c275979a336769488] | committer: Michael Niedermayer

Merge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'

* commit '06db45523c1068c24f049ef2b20fcdead3bf36d8':
  configure: Support the extended pkgconf syntax

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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