← Back to branch summary

~noskcaj/ubuntu/saucy/libav/merge0.8.7-1

« back to all changes in this revision

Viewing changes to libavcodec/bmp.c

  • Committer: Package Import Robot
  • Author(s): Jamie Strandboge
  • Date: 2012-11-16 12:39:50 UTC
  • mfrom: (26.1.1 quantal-security)
  • Revision ID: package-import@ubuntu.com-20121116123950-p11m12vkg2n8zc98
Tags: 6:0.8.4-0ubuntu1
No change rebuild for raring

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/bmp.c
227
227
    if(comp == BMP_RLE4 || comp == BMP_RLE8)
228
228
        memset(p->data[0], 0, avctx->height * p->linesize[0]);
229
229
 
230
 
    if(depth == 4 || depth == 8)
231
 
        memset(p->data[1], 0, 1024);
232
 
 
233
230
    if(height > 0){
234
231
        ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
235
232
        linesize = -p->linesize[0];
240
237
 
241
238
    if(avctx->pix_fmt == PIX_FMT_PAL8){
242
239
        int colors = 1 << depth;
 
240
 
 
241
        memset(p->data[1], 0, 1024);
 
242
 
243
243
        if(ihsize >= 36){
244
244
            int t;
245
245
            buf = buf0 + 46;