Revision a6f2c0d6

View differences:

libavcodec/motion_est.c
307 307
        c->sub_motion_search= no_sub_motion_search;
308 308
    }
309 309

  
310
    c->temp= c->scratchpad;
311

  
312 310
    return 0;
313 311
}
314 312

  
libavcodec/mpegvideo.c
289 289

  
290 290
     //FIXME should be linesize instead of s->width*2 but that is not known before get_buffer()
291 291
    CHECKED_ALLOCZ(s->me.scratchpad,  (s->width+64)*4*16*2*sizeof(uint8_t))
292
    s->me.temp=         s->me.scratchpad;
292 293
    s->rd_scratchpad=   s->me.scratchpad;
293 294
    s->b_scratchpad=    s->me.scratchpad;
294 295
    s->obmc_scratchpad= s->me.scratchpad + 16;
......
315 316

  
316 317
    av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL;
317 318
    av_freep(&s->me.scratchpad);
319
    s->me.temp=
318 320
    s->rd_scratchpad=
319 321
    s->b_scratchpad=
320 322
    s->obmc_scratchpad= NULL;
......
331 333
    COPY(allocated_edge_emu_buffer);
332 334
    COPY(edge_emu_buffer);
333 335
    COPY(me.scratchpad);
336
    COPY(me.temp);
334 337
    COPY(rd_scratchpad);
335 338
    COPY(b_scratchpad);
336 339
    COPY(obmc_scratchpad);
libavcodec/snow.c
4007 4007
    s->m.flags   = avctx->flags;
4008 4008
    s->m.bit_rate= avctx->bit_rate;
4009 4009

  
4010
    s->m.me.temp      =
4010 4011
    s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
4011 4012
    s->m.me.map       = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
4012 4013
    s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
......
4435 4436
    av_freep(&s->spatial_dwt_buffer);
4436 4437
    av_freep(&s->spatial_idwt_buffer);
4437 4438

  
4439
    s->m.me.temp= NULL;
4438 4440
    av_freep(&s->m.me.scratchpad);
4439 4441
    av_freep(&s->m.me.map);
4440 4442
    av_freep(&s->m.me.score_map);

Also available in: Unified diff