[FFmpeg-cvslog] Merge commit '381a722562bcc0b623acf6a00a583fe989bcb72a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 02:37:51 2013 +0100| [26c2e3bf1a7127fd2e19f23cbfa29c3f999ecdb9] | committer: Michael Niedermayer

Merge commit '381a722562bcc0b623acf6a00a583fe989bcb72a'

* commit '381a722562bcc0b623acf6a00a583fe989bcb72a':
  mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function

Conflicts:
	libavcodec/mpegvideo.c

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

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