[FFmpeg-cvslog] Merge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 29 00:27:45 2014 +0200| [621d4089a4cff0066d5cfc006cf20d99414ee9f9] | committer: Michael Niedermayer

Merge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0'

* commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0':
  configure: Use require_pkg_config for Speex

Conflicts:
	configure

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

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