[FFmpeg-cvslog] Merge commit '96ce6d6f119a16e489941c629a2805204322b717'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 17 21:07:05 2014 +0200| [eb706575baa646d3d2400d85a521386a4df3d979] | committer: Michael Niedermayer

Merge commit '96ce6d6f119a16e489941c629a2805204322b717'

* commit '96ce6d6f119a16e489941c629a2805204322b717':
  doc: Add more information in the README

Conflicts:
	README.md

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

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