From: Clément Bœsch <u@pkh.me>
Date: Tue, 24 Jan 2017 15:34:00 +0000 (+0100)
Subject: Merge commit 'a8fce24b9c5a87187f5bd864b18f5b3e575f8c3d'
X-Git-Tag: n3.4-dev~1347
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/8504d64bcbd1c25d4c91eb75af3f4a79a641854e

Merge commit 'a8fce24b9c5a87187f5bd864b18f5b3e575f8c3d'

* commit 'a8fce24b9c5a87187f5bd864b18f5b3e575f8c3d':
  avconv_dxva2: support HEVC Main10 decoding

This commit is a noop, see 1ec14612a5bd3506ffd755f8d42db776bfa40ae8

Merged-by: Clément Bœsch <u@pkh.me>
---

8504d64bcbd1c25d4c91eb75af3f4a79a641854e