[FFmpeg-cvslog] Merge commit '390acbea0697a60300f249602dbf701e04274693'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 02:22:16 2014 +0100| [3a05d7a9e583b8f5fee361d97d6793cf01974af2] | committer: Michael Niedermayer

Merge commit '390acbea0697a60300f249602dbf701e04274693'

* commit '390acbea0697a60300f249602dbf701e04274693':
  configure: Provide --pkg-config-flags

Conflicts:
	configure

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

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