Merge commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 01:47:50 +0000 (02:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 01:48:17 +0000 (02:48 +0100)
commita2dd2d7998a775167c18e844193b3686590934c1
treeae4954eb725a72599a3027fe25a7e7c0e62f5b0c
parent70cf40f9eb0365c7d9540328994c16690aa88c09
parent1ddd3e23a49b9eec11c62dca018238cf7349c90f
Merge commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f'

* commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f':
  vaapi_h264: fix slice data offset

See: aba3030a5593ceb0b9390cbc4c58642f372a17a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>