* commit '8b5007a3':
  mpegvideo: Move ER functions to a separate file

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