* commit '1761ab83':
  lavc: Deprecate avctx.rc_strategy

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