* commit 'ee870491':
  mpegvideo: reindent

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