* qatar/master:
  lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables

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