[FFmpeg-cvslog] Merge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 19:15:49 2014 +0200| [cdfd61b78ba6026b51526661daad6cd708fab352] | committer: Michael Niedermayer

Merge commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a' into release/0.10

* commit '28f2d3c5a5a3a3c14a68cf691054f15e4f23355a':
  cmdutils: Conditionally compile libswscale-related bits

Conflicts:
	cmdutils.c

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

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