From a6f2c0d6e5ccedf2f25c1ea9d83fc646e644ef52 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 2 Dec 2008 10:43:08 +0000 Subject: Fix regression test failure with pthreads on multiprocessor systems. Fixes issue517 Originally committed as revision 15976 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavcodec/mpegvideo.c') diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 4bc32a2316..ddc4d091aa 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -289,6 +289,7 @@ static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ //FIXME should be linesize instead of s->width*2 but that is not known before get_buffer() CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t)) + s->me.temp= s->me.scratchpad; s->rd_scratchpad= s->me.scratchpad; s->b_scratchpad= s->me.scratchpad; s->obmc_scratchpad= s->me.scratchpad + 16; @@ -315,6 +316,7 @@ static void free_duplicate_context(MpegEncContext *s){ av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL; av_freep(&s->me.scratchpad); + s->me.temp= s->rd_scratchpad= s->b_scratchpad= s->obmc_scratchpad= NULL; @@ -331,6 +333,7 @@ static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){ COPY(allocated_edge_emu_buffer); COPY(edge_emu_buffer); COPY(me.scratchpad); + COPY(me.temp); COPY(rd_scratchpad); COPY(b_scratchpad); COPY(obmc_scratchpad); -- cgit v1.2.3