[FFmpeg-cvslog] Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  7 11:13:46 2013 +0200| [dce12f694864454c5e5a987bd3fa808e66268af4] | committer: Michael Niedermayer

Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
	libswscale/swscale_unscaled.c
	libswscale/utils.c

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

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