Merge commit '737d35e33408263c04d7730f5487eed0d04938ba'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 12:37:39 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 13:46:15 +0000 (14:46 +0100)
commit6f764d291121f4980b292cdaa537aa8fb10cb93b
treed5b576132ba517872c2bad8e8423a96e3d0bef3b
parenta6ab9ed50d8a5b749f3e0a670e4fd6ee52d92b94
parent737d35e33408263c04d7730f5487eed0d04938ba
Merge commit '737d35e33408263c04d7730f5487eed0d04938ba'

* commit '737d35e33408263c04d7730f5487eed0d04938ba':
  vdpau: add support for the H.264 High 4:4:4 Predictive profile

Conflicts:
libavcodec/vdpau_internal.h

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