Merge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:27:43 +0000 (17:27 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:27:43 +0000 (17:27 -0300)
commit7d3bb052c8b9756e6fd40c32a88627dc58b0bc50
tree8c7e6e53c4f70496c54cb8f143103df5c818da9f
parent27324825defa0d2458a33aa34046ccfcdeac9502
parent624aa8ab221cf34693f9a8c5ab67219cf560f2bb
Merge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'

* commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb':
  build: Add missing Makefile entries and ifdefs for QSV hwaccels

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