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>

diff --cc libavcodec/mpegvideo_enc.c
index d03b57e,be6fb08..1ecf4aa
--- 1/libavcodec/mpegvideo_enc.c
--- 2/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@@ -1190,11 -1048,11 +1190,11 @@@ static int load_input_picture(MpegEncCo
                              src += src_stride;
                          }
                      }
 -                    if ((s->width & 15) || (s->height & 15)) {
 +                    if ((s->width & 15) || (s->height & (vpad-1))) {
                          s->mpvencdsp.draw_edges(dst, dst_stride,
                                                  w, h,
-                                                 16>>h_shift,
-                                                 vpad>>v_shift,
+                                                 16 >> h_shift,
 -                                                16 >> v_shift,
++                                                vpad >> v_shift,
                                                  EDGE_BOTTOM);
                      }
                  }