Merge commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:13:58 +0000 (18:13 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:15:42 +0000 (18:15 -0300)
commit530066166e3c510c3d9c21ff2ae17400adac3dce
treec86f514f6b173765ffa55038b7e8685004be14c2
parentc43fd1f279ced22626f7183f6e20404756228d84
parent0cf86fabfa5820596cca2cfead63c6f8df76c3f2
Merge commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2'

* commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2':
  vaapi_encode: Write sequence header as extradata

This commit is a noop. It has already been cherry-picked in
51020adcecf4004c1586a708d96acc6cbddd050a

Merged-by: James Almer <jamrial@gmail.com>