Mercurial > mplayer.hg

comparison libswscale/swscale.c @ 30317:67b85934c374

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reindent after the last commit.
author stefano
date Sun, 17 Jan 2010 23:02:20 +0000
parents 93e7fdf664a7
children 862c1c9d733b
comparison
equal deleted inserted replaced
30316:93e7fdf664a7 30317:67b85934c374
2034 2034
2035 if (!usePal(srcFormat)) 2035 if (!usePal(srcFormat))
2036 av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n", 2036 av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2037 sws_format_name(srcFormat), sws_format_name(dstFormat)); 2037 sws_format_name(srcFormat), sws_format_name(dstFormat));
2038 else { 2038 else {
2039 switch(dstFormat) { 2039 switch (dstFormat) {
2040 case PIX_FMT_RGB32 : conv = palette8topacked32; break; 2040 case PIX_FMT_RGB32 : conv = palette8topacked32; break;
2041 case PIX_FMT_BGR32 : conv = palette8topacked32; break; 2041 case PIX_FMT_BGR32 : conv = palette8topacked32; break;
2042 case PIX_FMT_BGR32_1: conv = palette8topacked32; break; 2042 case PIX_FMT_BGR32_1: conv = palette8topacked32; break;
2043 case PIX_FMT_RGB32_1: conv = palette8topacked32; break; 2043 case PIX_FMT_RGB32_1: conv = palette8topacked32; break;
2044 case PIX_FMT_RGB24 : conv = palette8topacked24; break; 2044 case PIX_FMT_RGB24 : conv = palette8topacked24; break;
2045 case PIX_FMT_BGR24 : conv = palette8topacked24; break; 2045 case PIX_FMT_BGR24 : conv = palette8topacked24; break;
2046 default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n", 2046 default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2047 sws_format_name(srcFormat), sws_format_name(dstFormat)); break; 2047 sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
2048 } 2048 }
2049 } 2049 }
2050 2050
2051 if (conv) 2051 if (conv)
2052 for (i=0; i<srcSliceH; i++) { 2052 for (i=0; i<srcSliceH; i++) {
2053 conv(srcPtr, dstPtr, c->srcW, (uint8_t *) c->pal_rgb); 2053 conv(srcPtr, dstPtr, c->srcW, (uint8_t *) c->pal_rgb);
2054 srcPtr+= srcStride[0]; 2054 srcPtr+= srcStride[0];
2055 dstPtr+= dstStride[0]; 2055 dstPtr+= dstStride[0];
2056 } 2056 }
2057 2057
2058 return srcSliceH; 2058 return srcSliceH;
2059 } 2059 }
2060 2060
2061 /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */ 2061 /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */