diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-23 23:59:18 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-24 00:03:21 +0300 |
| commit | e40cdf8604f14feaa41323ae8fdfdf187a257d55 (patch) | |
| tree | 4e40f0cbf5dd2a0dc0270108f89d21c69a9b2333 /libavcodec | |
| parent | 72d99c8c2647c77e01dfc82a354d500d48258469 (diff) | |
| parent | 2a06c2a03e1205aaeede5af850b9271752ddd4cf (diff) | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d03b57e558..1ecf4aacfb 100644 --- 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); } } |