[FFmpeg-cvslog] Merge commit '5c8280c3075dd54f26752c3a1185647578421703'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 15:48:50 2015 +0100| [a4952e7343f9a77d2995d699ac045b095ab11052] | committer: Michael Niedermayer

Merge commit '5c8280c3075dd54f26752c3a1185647578421703'

* commit '5c8280c3075dd54f26752c3a1185647578421703':
  h264: move last_qscale_diff into the per-slice context

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

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