[FFmpeg-cvslog] Merge commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 24 02:47:50 2015 +0100| [a2dd2d7998a775167c18e844193b3686590934c1] | committer: Michael Niedermayer

Merge commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f'

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

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

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