[FFmpeg-cvslog] Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 03:04:32 2013 +0100| [08667c26780dcdf2ef9ce410b2c78931a1e94e83] | committer: Michael Niedermayer

Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'

* commit '0b0a7a751de02464a33717e70352f696372ba1c4':
  mpegvideo: move encode-only parts of common_end() to encode_end()

Conflicts:
	libavcodec/mpegvideo.c

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

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