[FFmpeg-cvslog] Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  9 14:00:33 2013 +0200| [4ce82e6fa94c96ec2db76ce3be200e58f0a577c3] | committer: Michael Niedermayer

Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1'

* commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1':
  build: Require yasm 0.8.0 or higher

Conflicts:
	configure

If someone wants to continue supporting older yasm/nasm versions, patches are of course welcome!

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

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