Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'

* commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf': mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions Conflicts: libavcodec/mpegvideo_enc.c See: 1e78679768 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · e40cdf8604
parent 72d99c8c26 2a06c2a03e
commit e40cdf8604
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@ -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);
                    }
                }