[FFmpeg-cvslog] Merge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  4 13:15:00 2013 +0200| [44d884f036fa8147e8a16d2753c379198a5d5a6b] | committer: Michael Niedermayer

Merge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d'

* commit '7f9e893f56db52078e0f46677ed337b2e25fa94d':
  build: Report an error message when a pc file is not found

Conflicts:
	configure

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

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