Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:56:29 +0000 (02:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:56:29 +0000 (02:56 +0100)
commitfb17f03dadc3e344e3d996d7ea0f09e340fdd05b
tree92843c3413846672b90e2b94c768ec926ec4202f
parentad5e4e0f947ab686325fc7783afd18cd9cd88dc4
parentaec25b1c4650944d32706bfd40eb02bbd5587303
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@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c