From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 8 Nov 2013 17:00:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-6.0-r1~9087
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e93523a06f27e08bf43725f49c179e0bab2c69cb;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h263dsp: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

e93523a06f27e08bf43725f49c179e0bab2c69cb