* commit '0ddc53da':
  mpegvideo: synchronize AVFrame pointers in ERContext fully

Conflicts:
	libavcodec/mpegvideo.c

See: 8ef9dcf1Merged-by: Michael Niedermayer <michaelni@gmx.at>