[FFmpeg-cvslog] Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 03:07:47 2014 +0200| [0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb] | committer: Michael Niedermayer

Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'

* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
  lavu: Add packed YVYU422 pixel format

Conflicts:
	libavutil/version.h

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

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