* qatar/master:
  h261: Move mvmap table to the only place it is used

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