* qatar/master:
  libx264: introduce slice-max-size option
  Fixed size given to init_get_bits().
Merged-by: Michael Niedermayer <michaelni@gmx.at>