Merge commit 'cad739dace55e3446ef7180de688173cd19fb000'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:22:30 +0000 (22:22 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:22:30 +0000 (22:22 +0000)
commit9471122a1b5dec34572c3d4c675737f0493d140e
treeeb1347bfa0e2213822b1a432c0591be17ed29fd6
parentd23fff0d8a0e7df170c67a9dd5c1f7c1fc0da489
parentcad739dace55e3446ef7180de688173cd19fb000
Merge commit 'cad739dace55e3446ef7180de688173cd19fb000'

* commit 'cad739dace55e3446ef7180de688173cd19fb000':
  lavc: Add per-thread surfaces in get_hw_frame_parameters()

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/decode.c
libavcodec/dxva2.c