Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'
authorJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 16:30:27 +0000 (13:30 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 16:30:27 +0000 (13:30 -0300)
commiteba041476879fc46a49fa36fca03f1565ecaefca
tree937fd074b99894eb3f1c9ec096c8e74bbe12f946
parente9a5fc967867f9bd361f472306ca130bb64b0b04
parent59e7361cc791e5103be1712dc59a2055f118d0da
Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'

* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
  hwcontext: add a QSV implementation

Conflicts:
    doc/APIchanges
    libavutil/version.h

Merged-by: James Almer <jamrial@gmail.com>
doc/APIchanges
libavutil/Makefile
libavutil/hwcontext.c
libavutil/hwcontext.h
libavutil/hwcontext_internal.h
libavutil/hwcontext_qsv.c
libavutil/hwcontext_qsv.h
libavutil/version.h