* commit '2a06c2a0':
  mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

Conflicts:
	libavcodec/mpegvideo_enc.c

See: 1e786797Merged-by: Michael Niedermayer <michaelni@gmx.at>