Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Jan 2015 20:59:18 +0000 (21:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Jan 2015 21:03:21 +0000 (22:03 +0100)
commite40cdf8604f14feaa41323ae8fdfdf187a257d55
tree4e40f0cbf5dd2a0dc0270108f89d21c69a9b2333
parent72d99c8c2647c77e01dfc82a354d500d48258469
parent2a06c2a03e1205aaeede5af850b9271752ddd4cf
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@gmx.at>
libavcodec/mpegvideo_enc.c