[FFmpeg-cvslog] Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 13:08:04 2013 +0100| [df4517106a3ca494bbdd9c42a5eae1f74f8c3ad3] | committer: Michael Niedermayer

Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba'

* commit 'ee8704916de79158da8a48a9ea5be819e83d23ba':
  mpegvideo: reindent

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df4517106a3ca494bbdd9c42a5eae1f74f8c3ad3
---