[FFmpeg-cvslog] Merge commit 'd0adf55c05beaf80420747dded2d1884bff377ec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 18:39:10 2014 +0100| [332f1698559e67f97a68383c9c1768880f4902ce] | committer: Michael Niedermayer

Merge commit 'd0adf55c05beaf80420747dded2d1884bff377ec'

* commit 'd0adf55c05beaf80420747dded2d1884bff377ec':
  configure: Split some logical blocks off from CONFIG_LIST

Conflicts:
	configure

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

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