Merge commit '09a145b3c837273b1379321e44386a3233156e75'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 15:02:43 +0000 (16:02 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 15:05:51 +0000 (16:05 +0100)
commit2feef75cb5e62faecd66b3a16978fda372f66324
treec817ae488e7a0e11089e4cf1dd3039906bc76b8f
parente07fa3008bcafc027e9aa654657bae1f1ac64f5d
parent09a145b3c837273b1379321e44386a3233156e75
Merge commit '09a145b3c837273b1379321e44386a3233156e75'

* commit '09a145b3c837273b1379321e44386a3233156e75':
  hwcontext_vdpau: Remove duplicate definition of GET_CALLBACK

Merged-by: Clément Bœsch <u@pkh.me>
libavutil/hwcontext_vdpau.c