[FFmpeg-cvslog] Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 12 13:13:36 2013 +0100| [fe54f6cb453c030f9aae2a703bf1e1e00caeb041] | committer: Michael Niedermayer

Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'

* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3':
  h264: Copy h264chroma dsp context to slice thread copies
  swscale: Disallow conversion to GBRP16

Conflicts:
	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=fe54f6cb453c030f9aae2a703bf1e1e00caeb041
---