Revision c4ca31d0 libswscale/swscale.c

View differences:

libswscale/swscale.c
1613 1613

  
1614 1614
    if(conv)
1615 1615
    {
1616
    if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
1617
        conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
1618
    else
1619
    {
1620
        int i;
1621
        uint8_t *srcPtr= src[0];
1622
        uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
1623

  
1624
        for (i=0; i<srcSliceH; i++)
1616
        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
1617
            conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
1618
        else
1625 1619
        {
1626
            conv(srcPtr, dstPtr, c->srcW*srcBpp);
1627
            srcPtr+= srcStride[0];
1628
            dstPtr+= dstStride[0];
1620
            int i;
1621
            uint8_t *srcPtr= src[0];
1622
            uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
1623

  
1624
            for (i=0; i<srcSliceH; i++)
1625
            {
1626
                conv(srcPtr, dstPtr, c->srcW*srcBpp);
1627
                srcPtr+= srcStride[0];
1628
                dstPtr+= dstStride[0];
1629
            }
1629 1630
        }
1630 1631
    }
1631
    }
1632 1632
    return srcSliceH;
1633 1633
}
1634 1634

  

Also available in: Unified diff