Merge commit '7c65a76b16bc3a44f1592acde2176f187a058797'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 21:46:10 +0000 (18:46 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 21:46:10 +0000 (18:46 -0300)
commitf61cf0e4df52130c138ee55691409044ab2e9833
tree8ad439a837c05114e50187b97446cfdbdc668cde
parent2ca3c049cd09527bafd48e50117283a6a965a1b2
parent7c65a76b16bc3a44f1592acde2176f187a058797
Merge commit '7c65a76b16bc3a44f1592acde2176f187a058797'

* commit '7c65a76b16bc3a44f1592acde2176f187a058797':
  lavc/qsvenc: add error messeage if ICQ unsupported.

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