* commit 'a3f4c930':
  mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

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