Commit e40cdf86 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '2a06c2a0'

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

Conflicts:
	libavcodec/mpegvideo_enc.c

See: 1e786797Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 72d99c8c 2a06c2a0
......@@ -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);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment