[FFmpeg-cvslog] Merge commit 'c77da21e5d15056b8ba060ee5ce9e73f26653612'

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Wed Nov 15 23:54:28 2017 +0000| [040a92c21f2a5fa1570521620acb600af0e058a6] | committer: Mark Thompson

Merge commit 'c77da21e5d15056b8ba060ee5ce9e73f26653612'

* commit 'c77da21e5d15056b8ba060ee5ce9e73f26653612':
  vaapi_h264: Do not use deprecated header type

This commit is a noop, see 32a618a948c20f18db102d0b0976790222a57105.

Merged-by: Mark Thompson <sw at jkqxz.net>

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