Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 12:25:52 +0000 (13:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 12:26:38 +0000 (13:26 +0100)
commita6ab9ed50d8a5b749f3e0a670e4fd6ee52d92b94
tree1cf5a875152433a8c7b95d693a0006e8c2e91a8f
parent751731540f5bae608a3b7755267d5a65623e35ea
parent1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec
Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec'

* commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec':
  avconv_vdpau: allocate video surface of VDPAU-specified size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_vdpau.c