Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 19:04:35 +0000 (20:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 19:04:35 +0000 (20:04 +0100)
commit4daf8bc31b91df518b021a3927478e78e2c24e35
tree2a80acb5783d87aaa67324e8113aef29bcc244aa
parent6bd001d76657bfcfe3cf11efd1256866a03ad329
parenta1f5164814ac29914e079f9a936ad65d78a78e9a
Merge remote-tracking branch 'qatar/master'

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

Conflicts:
libavcodec/vc1dsp.c

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