Merge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:07:39 +0000 (23:07 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:07:55 +0000 (23:07 +0100)
commit2d2af18f42c908d3126c105b0e8745ac7ba39350
tree844c0fefa64ac4221d967f871d4373bc200d469b
parent13b77e09c7e9cb0fdb1aacce454652a38bf04cdd
parentb3051a460cf02a5b86ff0d1e14abba23ea55ff6d
Merge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'

This commit is a no-op. We cherry picked it earlier.

* commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d':
  vaapi_h264: Fix bit offset of slice data.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>