Revision 9a180390 libswscale/swscale.c

View differences:

libswscale/swscale.c
2085 2085 
        case 0x83: conv= rgb15to32; break;
2086 2086 
        case 0x84: conv= rgb16to32; break;
2087 2087 
        case 0x86: conv= rgb24to32; break;
2088 
        default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2089 
                        sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
2090 2088 
        }
2091 2089 
    } else if (  (isBGR(srcFormat) && isRGB(dstFormat))
2092 2090 
             || (isRGB(srcFormat) && isBGR(dstFormat))) {
......
2107 2105 
        case 0x84: conv= rgb16tobgr32; break;
2108 2106 
        case 0x86: conv= rgb24tobgr32; break;
2109 2107 
        case 0x88: conv= rgb32tobgr32; break;
2110 
        default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2111 
                        sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
2112 2108 
        }
2113 
    } else {
2114 
        av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2115 
               sws_format_name(srcFormat), sws_format_name(dstFormat));
2116 2109 
    }
2117 2110 

  		




  2118
  
  
    
    if(conv) {


  		




  
  2111
  
    
    if (!conv) {


  		




  
  2112
  
    
        av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",


  		




  
  2113
  
    
               sws_format_name(srcFormat), sws_format_name(dstFormat));


  		




  
  2114
  
    
    } else {


  		




  2119
  2115
  
    
        const uint8_t *srcPtr= src[0];


  		




  2120
  2116
  
    
        if(srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1)


  		




  2121
  2117
  
    
            srcPtr += ALT32_CORR;


  		












Also available in:  Unified diff