Radically rebased, and omits a few in-between commits that are unnecessary for the end result. avconv_dxva2.c should probably also be deleted, but for now it'd only inflate the diff. As part of the rebase I've also removed Steve Lhomme as author name - let me know whether I should set his name back on the two relevant commits (first and last one), or how this should be correctly handled.
As far as I'm concerned, this is pretty much finished. Please review or merge. wm4 (5): lavu: add new D3D11 pixfmt and hwcontext lavc: set avctx->hwaccel before init dxva: preparations for new hwaccel API dxva: move d3d11 locking/unlocking to functions dxva: add support for new dxva2 and d3d11 hwaccel APIs Changelog | 1 + avtools/avconv.h | 2 + avtools/avconv_opt.c | 8 +- configure | 18 +- doc/APIchanges | 9 + libavcodec/allcodecs.c | 5 + libavcodec/decode.c | 4 +- libavcodec/dxva2.c | 723 +++++++++++++++++++++++++++++++++++++++-- libavcodec/dxva2_h264.c | 36 +- libavcodec/dxva2_hevc.c | 32 +- libavcodec/dxva2_internal.h | 63 +++- libavcodec/dxva2_mpeg2.c | 32 +- libavcodec/dxva2_vc1.c | 54 ++- libavcodec/h264_slice.c | 3 +- libavcodec/hevcdec.c | 3 +- libavcodec/mpeg12dec.c | 1 + libavcodec/vc1dec.c | 1 + libavcodec/version.h | 4 +- libavutil/Makefile | 3 + libavutil/hwcontext.c | 4 + libavutil/hwcontext.h | 1 + libavutil/hwcontext_d3d11va.c | 488 +++++++++++++++++++++++++++ libavutil/hwcontext_d3d11va.h | 158 +++++++++ libavutil/hwcontext_dxva2.h | 3 + libavutil/hwcontext_internal.h | 1 + libavutil/pixdesc.c | 4 + libavutil/pixfmt.h | 4 +- libavutil/version.h | 4 +- 28 files changed, 1597 insertions(+), 72 deletions(-) create mode 100644 libavutil/hwcontext_d3d11va.c create mode 100644 libavutil/hwcontext_d3d11va.h -- 2.11.0 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel