[FFmpeg-cvslog] Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 23 21:59:18 2015 +0100| [e40cdf8604f14feaa41323ae8fdfdf187a257d55] | committer: Michael Niedermayer

Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'

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

Conflicts:
	libavcodec/mpegvideo_enc.c

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

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