Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 May 2015 20:02:00 +0000 (22:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 May 2015 20:24:34 +0000 (22:24 +0200)
commit947b74ee7da7984b666a478164917e42d4f4592d
treec2de5e9e2059cf14329979e77981819cc5cee7d3
parent9aabc926ca14faf240d078c7e428045b62018c8b
parentd8039ef8d221ea273aa4f1e62e5df21bf618c772
Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'

* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772':
  D3D11va: add a Direct3D11 video decoder similar to DXVA2

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dxva2_vc1.c
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
19 files changed:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/d3d11va.h
libavcodec/dxva2.c
libavcodec/dxva2_h264.c
libavcodec/dxva2_hevc.c
libavcodec/dxva2_internal.h
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c
libavcodec/h264_slice.c
libavcodec/hevc.c
libavcodec/mpeg12dec.c
libavcodec/vc1dec.c
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h