Merge commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:23:26 +0000 (19:23 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:23:26 +0000 (19:23 -0300)
commit7167ac33a8f2c7d063384c267f984f23d2b73854
treee5d4d881507af94a2b7f816eee7867a794c8731b
parent768b07e3bca7e81d2f9c60badb3973d3d88481dc
parentc1bcd321ea2c2ae1765a1e64f03278712221d726
Merge commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726'

* commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726':
  avcodec/qsv: fix async support

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsvdec.c
libavcodec/qsvdec_h2645.c
libavcodec/qsvdec_other.c
libavcodec/qsvenc.c
libavcodec/qsvenc.h