[FFmpeg-cvslog] Merge commit '8a66fd40260b7aae6226d68c4dbad43b05a8e524'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 13:55:25 2015 +0200| [cc87493f0654b3bf7d108df90bad4313d993576b] | committer: Michael Niedermayer

Merge commit '8a66fd40260b7aae6226d68c4dbad43b05a8e524'

* commit '8a66fd40260b7aae6226d68c4dbad43b05a8e524':
  h264: drop the reinit parameter from init_slice_header()

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

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