← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty-updates

« back to all changes in this revision

Viewing changes to libavcodec/dxva2.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2016-12-07 15:36:50 UTC
  • mfrom: (1.2.25)
  • Revision ID: package-import@ubuntu.com-20161207153650-u2rc3jww4ahryde2
Tags: 6:9.20-0ubuntu0.14.04.1
https://launchpad.net/bugs/1643467
* SECURITY UPDATE: Updated to 9.20 to fix various crashes with
  invalid-free, corrupted double-linked list or out-of-bounds read
  (LP: #1643467)
  - No CVE number

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/dxva2.c
76
76
    return result;
77
77
}
78
78
 
79
 
int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s,
 
79
int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic,
80
80
                              const void *pp, unsigned pp_size,
81
81
                              const void *qm, unsigned qm_size,
82
82
                              int (*commit_bs_si)(AVCodecContext *,
90
90
    int      result;
91
91
 
92
92
    if (FAILED(IDirectXVideoDecoder_BeginFrame(ctx->decoder,
93
 
                                               ff_dxva2_get_surface(s->current_picture_ptr),
 
93
                                               ff_dxva2_get_surface(pic),
94
94
                                               NULL))) {
95
95
        av_log(avctx, AV_LOG_ERROR, "Failed to begin frame\n");
96
96
        return -1;
146
146
        result = -1;
147
147
    }
148
148
 
149
 
    if (!result)
150
 
        ff_draw_horiz_band(s, 0, s->avctx->height);
151
149
    return result;
152
150
}