[FFmpeg-cvslog] Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  7 10:59:26 2013 +0200| [2060d944090f10fb60e5c0ac42b7a946b9d5859f] | committer: Michael Niedermayer

Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
  swscale: add support for endianness only conversion

Conflicts:
	libswscale/utils.c
	libswscale/version.h

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

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