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)
* qatar/master:
  libx264: introduce slice-max-size option
  Fixed size given to init_get_bits().

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

Simple merge