Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 12:08:36 +0000 (13:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 12:08:36 +0000 (13:08 +0100)
* commit '728c4658563dc82115ade0f1679679eddb7be5ff':
  vdpau: add a constructor for AVVDPAUContext.

Conflicts:
libavcodec/vdpau.h

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

No differences found