]> git.sesse.net Git - ffmpeg/commit
Merge commit 'c77da21e5d15056b8ba060ee5ce9e73f26653612'
authorMark Thompson <sw@jkqxz.net>
Wed, 15 Nov 2017 23:54:28 +0000 (23:54 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 15 Nov 2017 23:55:10 +0000 (23:55 +0000)
commit040a92c21f2a5fa1570521620acb600af0e058a6
tree9c735dd95a1728de24158d5d0b90f2fdcc633c5b
parent4251e25272d6a51433805956ea26425d7ccd74cb
parentc77da21e5d15056b8ba060ee5ce9e73f26653612
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@jkqxz.net>