Merge commit '8a66fd40260b7aae6226d68c4dbad43b05a8e524'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 11:55:25 +0000 (13:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 11:55:58 +0000 (13:55 +0200)
commitcc87493f0654b3bf7d108df90bad4313d993576b
treeacf3a159f174658539bfb74736da1faa7d425f32
parent51f7ba9ceec0053ee9c1ad900e1e0a49d3008137
parent8a66fd40260b7aae6226d68c4dbad43b05a8e524
Merge commit '8a66fd40260b7aae6226d68c4dbad43b05a8e524'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_slice.c