* commit 'b78f81c8':
  h261: K&R formatting and prettyprinting cosmetics

Conflicts:
	libavcodec/h261_parser.c
	libavcodec/h261data.h
	libavcodec/h261dec.c
	libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>