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)
* commit '09a145b3c837273b1379321e44386a3233156e75':
  hwcontext_vdpau: Remove duplicate definition of GET_CALLBACK

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

Simple merge