[FFmpeg-cvslog] Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 22 11:37:09 2013 +0200| [85f8a3cb50c3950acc8d9854880cf620c60667a5] | committer: Michael Niedermayer

Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'

* commit 'e208e6d209728d332343aa5390ae377ac0a6305c':
  lavu: Add interleaved 4:2:2 8/10-bit formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

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

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