Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 22 Jun 2016 20:38:49 +0000 (22:38 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 22 Jun 2016 20:38:49 +0000 (22:38 +0200)
commit3689efea3d59579291ecafccc3d9cbe720e7bea3
tree7bde9ce5ad61c7b9fe7f5bb0e23ea17a0adc90f5
parentd0b21b28a3d348c0302c98cee23c4820cd13e1e2
parentc46db38cde8e8fd8ecb1c6602f10ec0e002f29a8
Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'

* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
  hwcontext: add a dxva2 implementation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavutil/Makefile
libavutil/hwcontext.c
libavutil/hwcontext.h
libavutil/hwcontext_dxva2.c
libavutil/hwcontext_dxva2.h
libavutil/hwcontext_internal.h
libavutil/version.h