diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-12 12:31:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-17 12:21:48 +0100 |
commit | 85407c7e63722a2d723257e8cf5f281a8c9f34a4 (patch) | |
tree | c06dd077b13fe9ccd68339ea26c3fd7366a59f3c /libavcodec/mpegvideo_enc.c | |
parent | 52da3f6f70b1e95589a152aaf224811756fb9665 (diff) | |
download | ffmpeg-85407c7e63722a2d723257e8cf5f281a8c9f34a4.tar.gz |
avcodec/mpegvideo: Fix edge emu buffer overlap with interlaced mpeg4
Fixes Ticket5936
Regression since c5fc8ae12622a507d7b9ee30ddcd3734e6de6b1d
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1540e5c11d..10b4c5b8c4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2276,7 +2276,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, (mb_y * mb_block_height * wrap_c) + mb_x * mb_block_width; if((mb_x * 16 + 16 > s->width || mb_y * 16 + 16 > s->height) && s->codec_id != AV_CODEC_ID_AMV){ - uint8_t *ebuf = s->sc.edge_emu_buffer + 36 * wrap_y; + uint8_t *ebuf = s->sc.edge_emu_buffer + 38 * wrap_y; int cw = (s->width + s->chroma_x_shift) >> s->chroma_x_shift; int ch = (s->height + s->chroma_y_shift) >> s->chroma_y_shift; s->vdsp.emulated_edge_mc(ebuf, ptr_y, |