* commit '910247f1':
  lavc: Deprecate avctx.{inter,intra}_quant_bias

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