From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 16 Sep 2011 19:43:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-4.4-r1~16166
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=93869d4e4447fa68d46c2c555295bdc8ed32cc51;p=android-x86%2Fexternal-ffmpeg.git

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>
---

93869d4e4447fa68d46c2c555295bdc8ed32cc51