comparison rawdec.c @ 11669:bd1701d38721 libavcodec

avi bgr24 padding fix. Fixes issue1901
author michael
date Fri, 30 Apr 2010 22:09:42 +0000
parents 7dd2a45249a9
children 378caf7b42ef
comparison
equal deleted inserted replaced
11668:db33423d99ac 11669:bd1701d38721
150 } 150 }
151 if (avctx->palctrl && avctx->palctrl->palette_changed) { 151 if (avctx->palctrl && avctx->palctrl->palette_changed) {
152 memcpy(frame->data[1], avctx->palctrl->palette, AVPALETTE_SIZE); 152 memcpy(frame->data[1], avctx->palctrl->palette, AVPALETTE_SIZE);
153 avctx->palctrl->palette_changed = 0; 153 avctx->palctrl->palette_changed = 0;
154 } 154 }
155 if(avctx->pix_fmt==PIX_FMT_BGR24 && ((frame->linesize[0]+3)&~3)*avctx->height <= buf_size)
156 frame->linesize[0] = (frame->linesize[0]+3)&~3;
155 157
156 if(context->flip) 158 if(context->flip)
157 flip(avctx, picture); 159 flip(avctx, picture);
158 160
159 if ( avctx->codec_tag == MKTAG('Y', 'V', '1', '2') 161 if ( avctx->codec_tag == MKTAG('Y', 'V', '1', '2')