* commit '9e0f14f1':
  lavc: Make pointers to ff_cropTbl const
  vp3: Embed idct_permutation array directly in VP3DecoderContext

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