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)
commit31c09b7663acdcc64031d6f251a667ce812f590f
treea938859264028d21a5a23b55b6c4b37ebed9ab55
parent5f231d909f158e40d20281b88e7aecc2333057fe
parent728c4658563dc82115ade0f1679679eddb7be5ff
Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'

* commit '728c4658563dc82115ade0f1679679eddb7be5ff':
  vdpau: add a constructor for AVVDPAUContext.

Conflicts:
libavcodec/vdpau.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/vdpau.c
libavcodec/vdpau.h