← Back to branch summary

~ubuntu-branches/ubuntu/precise/libav/precise-updates

« back to all changes in this revision

Viewing changes to libavcodec/svq1enc.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-11-06 11:03:10 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20121106110310-u4wy6ck735vvj8tw
Tags: 4:0.8.4-0ubuntu0.12.04.1
https://launchpad.net/bugs/1075593
* Update to 0.8.4 to fix multiple security issues. (LP: #1075593)
  - CVE-2012-2772
  - CVE-2012-2775
  - CVE-2012-2776
  - CVE-2012-2777
  - CVE-2012-2779
  - CVE-2012-2784
  - CVE-2012-2786
  - CVE-2012-2787
  - CVE-2012-2788
  - CVE-2012-2789
  - CVE-2012-2790
  - CVE-2012-2793
  - CVE-2012-2794
  - CVE-2012-2796
  - CVE-2012-2798
  - CVE-2012-2800
  - CVE-2012-2801
  - CVE-2012-2802

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/svq1enc.c
402
402
                int mx, my, pred_x, pred_y, dxy;
403
403
                int16_t *motion_ptr;
404
404
 
405
 
                motion_ptr= h263_pred_motion(&s->m, 0, 0, &pred_x, &pred_y);
 
405
                motion_ptr= ff_h263_pred_motion(&s->m, 0, 0, &pred_x, &pred_y);
406
406
                if(s->m.mb_type[x + y*s->m.mb_stride]&CANDIDATE_MB_TYPE_INTER){
407
407
                    for(i=0; i<6; i++)
408
408
                        init_put_bits(&s->reorder_pb[i], reorder_buffer[1][i], 7*32);
492
492
    s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
493
493
    s->mb_type        = av_mallocz((s->y_block_width+1)*s->y_block_height*sizeof(int16_t));
494
494
    s->dummy          = av_mallocz((s->y_block_width+1)*s->y_block_height*sizeof(int32_t));
495
 
    h263_encode_init(&s->m); //mv_penalty
 
495
    ff_h263_encode_init(&s->m); //mv_penalty
496
496
 
497
497
    return 0;
498
498
}