Merge commit '5c1585c4c3b5281835d784c5daef0069915ccd57'
authorJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:48:29 +0000 (23:48 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:48:29 +0000 (23:48 -0300)
commit17487f11bb68b1d43a5d1048749cef7f627bacdb
tree97c6dc7a2d23ba6d65876b92ae8c7919c5df51f7
parentc68a3ab96ec0497ae2d627ddd30c61737d18173e
parent5c1585c4c3b5281835d784c5daef0069915ccd57
Merge commit '5c1585c4c3b5281835d784c5daef0069915ccd57'

* commit '5c1585c4c3b5281835d784c5daef0069915ccd57':
  lavc: Drop deprecated VDPAU buffer fields

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/vdpau.c
libavcodec/vdpau.h
libavcodec/version.h