[FFmpeg-cvslog] Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 10 13:48:21 2013 +0100| [42431a557e2df0289e725b518b0d7a3e1a4e39b3] | committer: Michael Niedermayer

Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'

* commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821':
  sws: GBRP9, GBRP10, and GBRP16 output support

Conflicts:
	libswscale/output.c
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

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

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