[FFmpeg-cvslog] Merge commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 19:08:14 2014 +0100| [56a498bbba3f71a049d0a735e6421c0b38e01890] | committer: Michael Niedermayer

Merge commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b'

* commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b':
  configure: Split some logical blocks off from HAVE_LIST

Conflicts:
	configure

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

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