Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Jul 2013 10:08:43 +0000 (12:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Jul 2013 10:08:43 +0000 (12:08 +0200)
commit98277fd1a0f7e153216bbbf62eab7c1d4f88b508
treed66be946ab7fa9e06ee23f6d9b997c4175da84c4
parent0844630e6b01b71ed9dd50158b94d2833f7f8269
parent4972e5a186fe8c0552869f793982627d1b318306
Merge remote-tracking branch 'qatar/master'

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

Conflicts:
libavcodec/bitstream_filter.c

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