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)
* commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd':
  avconv_vdpau: update to new VDPAU interface

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

No differences found