Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Sep 2011 19:43:40 +0000 (21:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Sep 2011 19:43:56 +0000 (21:43 +0200)
commit93869d4e4447fa68d46c2c555295bdc8ed32cc51
tree34d7c1019331233835d6453c2bd3f5e010ec3d8b
parent5c5306df962bbbaf6a3339850aa43771fc4add19
parent3a78fb57de0b8ee800d91c69e395b685e285a63b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: introduce slice-max-size option
  Fixed size given to init_get_bits().

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