Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Feb 2013 12:13:36 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Feb 2013 12:18:28 +0000 (13:18 +0100)
* 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@gmx.at>
1  2 
libavcodec/h264.c

Simple merge