* commit 'd5280455':
  mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c

The memset is left in place
Merged-by: Michael Niedermayer <michaelni@gmx.at>