Merge commit 'ebd5320afd42d4315851f3e0ca7f5d4a6300eb68'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 12:16:46 +0000 (13:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 12:17:20 +0000 (13:17 +0100)
commit751731540f5bae608a3b7755267d5a65623e35ea
tree099dc70e5da67345ba973c3ed87ea554054673f8
parentd7aaeea5402c81c83960080c5e6086560a962419
parentebd5320afd42d4315851f3e0ca7f5d4a6300eb68
Merge commit 'ebd5320afd42d4315851f3e0ca7f5d4a6300eb68'

* commit 'ebd5320afd42d4315851f3e0ca7f5d4a6300eb68':
  vdpau: add support for 4:2:2 and 4:4:4 chroma sampling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_slice.c
libavcodec/vdpau.c