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

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