[FFmpeg-cvslog] Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 13:35:02 2015 +0100| [c07b7e483af6a0bee49c0ac46030d9b10be4913b] | committer: Michael Niedermayer

Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'

* commit '5355ed6b20e941430c4f8fb82644e87a65366d61':
  h264: move {prev,next}_mb_skipped into the per-slice context

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

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