[FFmpeg-cvslog] Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 03:20:52 2014 +0200| [ed962414bd66027ce67ded912c17e08970163f52] | committer: Michael Niedermayer

Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
  swscale: support converting YVYU422 pixel format

Conflicts:
	libswscale/input.c

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

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