[FFmpeg-cvslog] Merge commit 'a6a675a79287565c3c23455439b114676b63a96c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 00:51:54 2014 +0200| [ffc2c095ef7c4bf8b330a841f9ed76b0648bbc2d] | committer: Michael Niedermayer

Merge commit 'a6a675a79287565c3c23455439b114676b63a96c'

* commit 'a6a675a79287565c3c23455439b114676b63a96c':
  configure: Drop stray error resilience dependencies

Conflicts:
	configure

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

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