Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 02:04:32 +0000 (03:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 02:12:10 +0000 (03:12 +0100)
commit08667c26780dcdf2ef9ce410b2c78931a1e94e83
treefe3224f5d4fcd36b3afc3d843e90d2d5aa62761a
parente3b7f0e184a0f21ef7e5c78e180fef258f9c73aa
parent0b0a7a751de02464a33717e70352f696372ba1c4
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@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c