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/mpegpicture.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/mpegpicture.c')
| -rw-r--r-- | libavcodec/mpegpicture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 6748fc2986..302f9d20d3 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -76,7 +76,7 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, // at uvlinesize. It supports only YUV420 so 24x24 is enough // linesize * interlaced * MBsize // we also use this buffer for encoding in encode_mb_internal() needig an additional 32 lines - FF_ALLOCZ_ARRAY_OR_GOTO(avctx, sc->edge_emu_buffer, alloc_size, 4 * 68, + FF_ALLOCZ_ARRAY_OR_GOTO(avctx, sc->edge_emu_buffer, alloc_size, 4 * 70, fail); FF_ALLOCZ_ARRAY_OR_GOTO(avctx, me->scratchpad, alloc_size, 4 * 16 * 2, |