* commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140':
avconv_vdpau: use the hwcontext API to simplify code
Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
The h264 decoder reports 4.1 as its maximum level, but it will decode
5.1 4K video just fine. In practice, the published level limits in
vdpau do not communicate anything that's actually useful.
* commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec':
avconv_vdpau: allocate video surface of VDPAU-specified size
Merged-by: Michael Niedermayer <michaelni@gmx.at>