[FFmpeg-cvslog] Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 11:33:56 2016 +0200| [28dcf1870660ea353ccc8e7a907712e681174228] | committer: Clément Bœsch

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 at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28dcf1870660ea353ccc8e7a907712e681174228
---