[FFmpeg-cvslog] Merge commit 'c98d164a6a2c3d93bfb10d44c946bc3ed56f14e7' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 20:01:22 2014 +0200| [5d790cdb9ee28f1f72d49f80fdbb257ba5258ab8] | committer: Michael Niedermayer

Merge commit 'c98d164a6a2c3d93bfb10d44c946bc3ed56f14e7' into release/0.10

* commit 'c98d164a6a2c3d93bfb10d44c946bc3ed56f14e7':
  configure: Check for -Werror parameters on clang

Conflicts:
	configure

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

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