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)
* 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

index d03b57e558ca6dc8ba3dce79c02641854f1820b9..1ecf4aacfb95f31b1a0f9210915754121ec15321 100644 (file)
@@ -1193,8 +1193,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
                     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,
+                                                vpad >> v_shift,
                                                 EDGE_BOTTOM);
                     }
                 }