Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'

Browse Source

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

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

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

pull/221/head

Clément Bœsch 9 years ago

parent 93a0f4a3cb 39cdbb12aa

commit 28dcf18706

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available