* commit '59b55c49':
  lavc: deprecate unused me_threshold field

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>