Merge commit 'a8fce24b9c5a87187f5bd864b18f5b3e575f8c3d'
authorClément Bœsch <u@pkh.me>
Tue, 24 Jan 2017 15:34:00 +0000 (16:34 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 24 Jan 2017 15:34:00 +0000 (16:34 +0100)
commit8504d64bcbd1c25d4c91eb75af3f4a79a641854e
tree776f86b3709a4355e967712065866fb89297be19
parent5f74ce0e4d5afc5f2f58059774f922d9d93869ea
parenta8fce24b9c5a87187f5bd864b18f5b3e575f8c3d
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>