* commit '0404ec61':
  h261: cosmetics: Move functions to avoid forward declarations

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