[FFmpeg-cvslog] Merge commit '551746680462538bb5ad7adf55fb1248190428ec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 27 18:21:23 2014 +0200| [5672107ed6961a88fc550885e4c8703597eb345b] | committer: Michael Niedermayer

Merge commit '551746680462538bb5ad7adf55fb1248190428ec'

* commit '551746680462538bb5ad7adf55fb1248190428ec':
  configure: Provide a safe default for unknonw libcs

Conflicts:
	configure

This is not merged as it does not work with musl here, while
our previous solution does.

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

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