[FFmpeg-cvslog] Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 02:12:11 2013 +0100| [20b28fc7b0aaa41c1837bf234e599d1714bc4d35] | committer: Michael Niedermayer

Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06'

* commit '1f8eb69079880ef1f394c498dfdf471f91222a06':
  mpegvideo: move encoding-only initialization from common_init() to encode_init()

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

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

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