[FFmpeg-cvslog] Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 16:23:56 2014 +0200| [4d8356b6788016d578941d1b43d141d5db2fdf14] | committer: Michael Niedermayer

Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d8356b6788016d578941d1b43d141d5db2fdf14
---