[FFmpeg-cvslog] Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 02:56:29 2014 +0100| [fb17f03dadc3e344e3d996d7ea0f09e340fdd05b] | committer: Michael Niedermayer

Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'

* commit 'aec25b1c4650944d32706bfd40eb02bbd5587303':
  mpegvideo: split the encoding-only parts of frame_start() into a separate function

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=fb17f03dadc3e344e3d996d7ea0f09e340fdd05b
---