Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 09:33:56 +0000 (11:33 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 09:38:53 +0000 (11:38 +0200)
commit28dcf1870660ea353ccc8e7a907712e681174228
treef94e5af64a2e68b25cabfb290b5ff97e73391a28
parent93a0f4a3cbb823b2ddcb66a3a4c8f08aa7934078
parent39cdbb12aa2140520246bc4c3e22436b9f8a121a
Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'

* commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a':
  dxva2_h264: Unbreak compilation after 3176217c6

This commit is a noop. The compilation was fixed in the merge commit
itself (1534ef87c74cc66a117bf61c467641c2129bc964). The additional local
unused sps is not merged.

Merged-by: Clément Bœsch <clement@stupeflix.com>