Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 14:23:56 +0000 (16:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 14:31:51 +0000 (16:31 +0200)
commit4d8356b6788016d578941d1b43d141d5db2fdf14
tree701ca9cdc20fb75dec240ab89872393372afa48c
parent0e57c051181c06d9a3468d5e072ded827ed09a53
parent8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd
Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'

* commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd':
  avconv_vdpau: update to new VDPAU interface

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